Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 14 Oct 2011 06:14:17 +0000 (23:14 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 14 Oct 2011 06:14:17 +0000 (23:14 -0700)
commit6c968b9dcc64c25fc792e4eb8a786d6bcc0a869f
tree99e451cea99ebe1ac6cecaae45d415003bc300b3
parent7f8e9fdf336aa4e4a2183f713ee45fd0d2150bbb
parente4804fe0d59e2cfb8374d1cbd0236ce510a77478
Merge from trunk.